Revert another font chooser feature that requires Pango 1.47

diff --git a/debian/changelog b/debian/changelog
index b8b63ab183c0aa7565a74908e31c4b1ea12e4aca..a50ce8417ce0b20b392f85a7cdcc48942d987c1e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,9 +14,11 @@ gtk+4.0 (3.99.2-1) UNRELEASED; urgency=medium
   * Stop installing NodeEditor icons.
     They're embedded in the executable via GResource now.
   * d/libgtk-4-0.symbols.in: Update
-  * d/p/debian/Revert-fontchooser-Determine-sample-text-intelligently.patch:
-    Revert automatic choice of preview text for font-chooser.
-    This requires Pango 1.47, which we don't have in Debian yet.
+  * d/p/debian/Revert-fontchooser-Determine-sample-text-intelligently.patch,
+    d/p/debian/Partially-revert-fontchooser-Add-user-filtering.patch:
+    In the font-chooser, revert automatic choice of preview text, and
+    filtering by the font's supported language.
+    These require Pango 1.47, which we don't have in Debian yet.
 
  -- Simon McVittie <smcv@debian.org>  Mon, 12 Oct 2020 10:51:44 +0100
 

diff --git a/debian/patches/debian/Partially-revert-fontchooser-Add-user-filtering.patch b/debian/patches/debian/Partially-revert-fontchooser-Add-user-filtering.patch
new file mode 100644 (file)
index 0000000..6e4031f
--- /dev/null
+++ b/debian/patches/debian/Partially-revert-fontchooser-Add-user-filtering.patch
@@ -0,0 +1,62 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 12 Oct 2020 11:42:33 +0100
+Subject: Partially revert "fontchooser: Add user filtering"
+
+Add some #if 0 to stub out more code paths that need Pango 1.47.
+
+This partially reverts commit 09604eb3eb3928429cceeeb235eb4ff3a0bd5169.
+
+Forwarded: not-needed
+---
+ gtk/gtkfontchooserwidget.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
+index 293e64e..3031cd1 100644
+--- a/gtk/gtkfontchooserwidget.c
++++ b/gtk/gtkfontchooserwidget.c
+@@ -361,7 +361,7 @@ user_filter_cb (gpointer item,
+       !pango_font_family_is_monospace (family))
+     return FALSE;
+ 
+-#ifdef HAVE_PANGOFT
++#if 0
+   if (self->filter_by_language &&
+       self->filter_language)
+     {
+@@ -892,7 +892,7 @@ axis_free (gpointer v)
+   g_free (a);
+ }
+ 
+-#ifdef HAVE_PANGOFT
++#if 0
+ static void
+ select_added (GListModel *model,
+               guint       position,
+@@ -989,7 +989,7 @@ add_to_fontlist (GtkWidget     *widget,
+ 
+   n = gtk_slice_list_model_get_size (model);
+ 
+-#ifdef HAVE_PANGOFT
++#if 0
+   for (i = n; i < n + 10; i++)
+     {
+       gpointer item = g_list_model_get_item (child_model, i);
+@@ -1035,7 +1035,7 @@ update_fontlist (GtkFontChooserWidget *self)
+   g_object_unref (model);
+ }
+ 
+-#ifdef HAVE_PANGOFT
++#if 0
+ static void
+ setup_lang_item (GtkSignalListItemFactory *factory,
+                  gpointer                  item,
+@@ -1166,7 +1166,7 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *self)
+ 
+   gtk_custom_filter_set_filter_func (self->user_filter, user_filter_cb, self, NULL);
+ 
+-#ifdef HAVE_PANGOFT
++#if 0
+   setup_language_list (self);
+ #else
+   gtk_widget_hide (GTK_WIDGET (self->language_button));

diff --git a/debian/patches/series b/debian/patches/series
index 5afb4ff596ee020da45b3947511c01775b7070ad..13c57d766b83f67289d36ec302a04f54a3f71a16 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Require-gtk-doc-1.33.patch
 debian/Revert-fontchooser-Determine-sample-text-intelligently.patch
+debian/Partially-revert-fontchooser-Add-user-filtering.patch